From f7e153faad1237a5e08ae2aa58d704d990843861 Mon Sep 17 00:00:00 2001 From: "kfraser@localhost.localdomain" Date: Mon, 26 Feb 2007 11:21:03 +0000 Subject: [PATCH] Resolve conflict over use of name xen_elfnote. Signed-off-by: Keir Fraser --- tools/libxc/xc_core.c | 2 +- tools/libxc/xc_core.h | 10 +++++----- tools/libxc/xc_ptrace_core.c | 2 +- xen/arch/x86/domain_build.c | 1 - xen/include/public/libelf.h | 1 + 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/libxc/xc_core.c b/tools/libxc/xc_core.c index 31c1532b69..5a23667667 100644 --- a/tools/libxc/xc_core.c +++ b/tools/libxc/xc_core.c @@ -328,7 +328,7 @@ xc_domain_dumpcore_via_callback(int xc_handle, Elf_Shdr *shdr; /* elf notes */ - struct xen_elfnote elfnote; + struct elfnote elfnote; struct xen_dumpcore_elfnote_none_desc none; struct xen_dumpcore_elfnote_header_desc header; struct xen_dumpcore_elfnote_xen_version_desc xen_version; diff --git a/tools/libxc/xc_core.h b/tools/libxc/xc_core.h index 2a65bc2501..cf5b15d12b 100644 --- a/tools/libxc/xc_core.h +++ b/tools/libxc/xc_core.h @@ -39,7 +39,7 @@ #define XEN_DUMPCORE_ELFNOTE_NAME "Xen" /* note numbers are defined in xen/elfnote.h */ -struct xen_elfnote { +struct elfnote { uint32_t namesz; /* Elf_Note note; */ uint32_t descsz; uint32_t type; @@ -88,22 +88,22 @@ struct xen_dumpcore_elfnote_format_version_desc { struct xen_dumpcore_elfnote_none { - struct xen_elfnote elfnote; + struct elfnote elfnote; struct xen_dumpcore_elfnote_none_desc none; }; struct xen_dumpcore_elfnote_header { - struct xen_elfnote elfnote; + struct elfnote elfnote; struct xen_dumpcore_elfnote_header_desc header; }; struct xen_dumpcore_elfnote_xen_version { - struct xen_elfnote elfnote; + struct elfnote elfnote; struct xen_dumpcore_elfnote_xen_version_desc xen_version; }; struct xen_dumpcore_elfnote_format_version { - struct xen_elfnote elfnote; + struct elfnote elfnote; struct xen_dumpcore_elfnote_format_version_desc format_version; }; diff --git a/tools/libxc/xc_ptrace_core.c b/tools/libxc/xc_ptrace_core.c index 4ce006b550..419b3e55af 100644 --- a/tools/libxc/xc_ptrace_core.c +++ b/tools/libxc/xc_ptrace_core.c @@ -280,7 +280,7 @@ elf_core_search_note(struct elf_core* ecore, const char* name, uint32_t type, n = ecore->note_sec; while (n < note_sec_end) { - const struct xen_elfnote *elfnote = (const struct xen_elfnote*)n; + const struct elfnote *elfnote = (const struct elfnote *)n; if (elfnote->namesz == strlen(name) + 1 && strncmp(elfnote->name, name, elfnote->namesz) == 0 && elfnote->type == type) { diff --git a/xen/arch/x86/domain_build.c b/xen/arch/x86/domain_build.c index 3954e033a1..841f181f99 100644 --- a/xen/arch/x86/domain_build.c +++ b/xen/arch/x86/domain_build.c @@ -28,7 +28,6 @@ #include #include -#include #include extern unsigned long initial_images_nrpages(void); diff --git a/xen/include/public/libelf.h b/xen/include/public/libelf.h index 59b8465108..4a580e00eb 100644 --- a/xen/include/public/libelf.h +++ b/xen/include/public/libelf.h @@ -10,6 +10,7 @@ #endif #undef ELFSIZE +#include "elfnote.h" #include "elfstructs.h" #include "features.h" -- 2.30.2